From 4e497304c67ad7b17cda4339150abeb05be13239 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Tue, 25 Jan 2022 22:02:07 +0100 Subject: [PATCH] Drop gmapbase.html (embedded in gpsbabelfe) --- debian/gpsbabel-gui.install | 1 - debian/patches/gmapbase.html-location | 11 ----------- debian/patches/series | 1 - 3 files changed, 13 deletions(-) delete mode 100644 debian/patches/gmapbase.html-location diff --git a/debian/gpsbabel-gui.install b/debian/gpsbabel-gui.install index 30392ad1b..c093b335a 100644 --- a/debian/gpsbabel-gui.install +++ b/debian/gpsbabel-gui.install @@ -1,4 +1,3 @@ gui/objects/gpsbabelfe /usr/bin debian/gpsbabel.xpm /usr/share/pixmaps gui/gpsbabel.desktop /usr/share/applications -gui/gmapbase.html /usr/share/gpsbabel diff --git a/debian/patches/gmapbase.html-location b/debian/patches/gmapbase.html-location deleted file mode 100644 index b95918ade..000000000 --- a/debian/patches/gmapbase.html-location +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gui/map.cc -+++ b/gui/map.cc -@@ -91,7 +91,7 @@ Map::Map(QWidget* parent, - // 1. In the file system in the same directory as the executable. - // 2. In the Qt resource system. This is useful if the resource was compiled - // into the executable. -- QString baseFile = QApplication::applicationDirPath() + "/gmapbase.html"; -+ QString baseFile = "/usr/share/gpsbabel/gmapbase.html"; - QString fileName; - QUrl baseUrl; - if (QFile(baseFile).exists()) { diff --git a/debian/patches/series b/debian/patches/series index 49b3f2c60..5cd9d3bfa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,7 +2,6 @@ gpsbabelfe_disable_version_check gpsbabelfe_opt-in-for-usage-data-reporting gpsbabelfe_do-not-check-for-newer-version htmldoc-location -gmapbase.html-location Disable-donation-nagging 0007-Add-workaround-for-failing-test-on-i386.patch 0008-Add-Debian-build-flags.patch -- 2.30.2